Adwaita: fix scales with marks on the dark variant

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 26a7fa94b0afa0caa359319899801dd88d43ddb4..87633245ec44433dd2986faec69204ff843e671d 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2299,6 +2299,7 @@ scale {
   // *WARNING* scale with marks madness following
 
   // FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those...
+  $suffix: if($variant == 'light', '', '-dark');
 
   @each $dir_class, $dir_infix in ('', 'horz'),
                                   ('.vertical', 'vert') {
@@ -2306,7 +2307,7 @@ scale {
                                       ('scale-has-marks-below', ':first-child:not(:only-child)') {
 
       &#{$dir_class} {
-        @each $state, $suffix in ('', ''),
+        @each $state, $state_infix in ('', ''),
                                  (':hover', '-hover'),
                                  (':active', '-active'),
                                  (':insensitive', '-insensitive'),
@@ -2319,7 +2320,7 @@ scale {
             slider{
               margin: 0;
               &#{$state} {
-                $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$suffix}';
+                $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}';
                 // @warn $_file_name; // uncomment for debuggin purpose...
                 border-style: none;
                 border-radius: 0;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index ce8d6b1e67ccc1f05e3bccae33f19ce0584c7f69..5d28e4b49bb3f1a2541e3fbedda67c1d61cd574b 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3075,7 +3075,7 @@ scale {
     scale trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png"));
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3084,7 +3084,7 @@ scale {
     scale trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png"));
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3093,7 +3093,7 @@ scale {
     scale trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png"));
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3102,7 +3102,7 @@ scale {
     scale trough:last-child:not(:only-child) slider:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png"));
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3111,7 +3111,7 @@ scale {
     scale trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png"));
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3120,7 +3120,7 @@ scale {
     scale trough:last-child:not(:only-child) slider:backdrop:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3129,7 +3129,7 @@ scale {
     scale trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3138,7 +3138,7 @@ scale {
     scale trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3147,7 +3147,7 @@ scale {
     scale trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3156,7 +3156,7 @@ scale {
     scale trough:first-child:not(:only-child) slider:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3165,7 +3165,7 @@ scale {
     scale trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3174,7 +3174,7 @@ scale {
     scale trough:first-child:not(:only-child) slider:backdrop:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3183,7 +3183,7 @@ scale {
     scale.vertical trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png"));
       background-position: left;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3192,7 +3192,7 @@ scale {
     scale.vertical trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png"));
       background-position: left;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3201,7 +3201,7 @@ scale {
     scale.vertical trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png"));
       background-position: left;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3210,7 +3210,7 @@ scale {
     scale.vertical trough:last-child:not(:only-child) slider:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png"));
       background-position: left;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3219,7 +3219,7 @@ scale {
     scale.vertical trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png"));
       background-position: left;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3228,7 +3228,7 @@ scale {
     scale.vertical trough:last-child:not(:only-child) slider:backdrop:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
       background-position: left;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3237,7 +3237,7 @@ scale {
     scale.vertical trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png"));
       background-position: right;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3246,7 +3246,7 @@ scale {
     scale.vertical trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png"));
       background-position: right;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3255,7 +3255,7 @@ scale {
     scale.vertical trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png"));
       background-position: right;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3264,7 +3264,7 @@ scale {
     scale.vertical trough:first-child:not(:only-child) slider:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png"));
       background-position: right;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3273,7 +3273,7 @@ scale {
     scale.vertical trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png"));
       background-position: right;
       background-repeat: no-repeat;
       box-shadow: none; }
@@ -3282,7 +3282,7 @@ scale {
     scale.vertical trough:first-child:not(:only-child) slider:backdrop:insensitive {
       border-style: none;
       border-radius: 0;
-      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png"));
+      background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
       background-position: right;
       background-repeat: no-repeat;
       box-shadow: none; }